Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 28 May 2011 19:14:18 +0000 (12:14 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 28 May 2011 19:14:18 +0000 (12:14 -0700)
commit170d38ddd2811ba715adc8a04fe4050acb281b13
tree9664ad21efef8e144e3e9eea4acae2dda24417e5
parent53680e79523af36698ec5dc6b2088b1abe64f501
parente34158d8e1f2e3762e997179cc5ed4e29bbb14e1
Merge from trunk.